remove conflict marker from ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 39686f82ee7a6f7dd1dd87aef08fe650c0dc6fcf..8fe10fdaac36126aa738fce9cd5e0c611cd09572 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001  Owen Taylor  <otaylor@redhat.com>
   
        * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of 
        style->font.
-  
->>>>>>> 1.2293
+
 Tue Sep 18 13:51:35 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 39686f82ee7a6f7dd1dd87aef08fe650c0dc6fcf..8fe10fdaac36126aa738fce9cd5e0c611cd09572 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001  Owen Taylor  <otaylor@redhat.com>
   
        * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of 
        style->font.
-  
->>>>>>> 1.2293
+
 Tue Sep 18 13:51:35 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 39686f82ee7a6f7dd1dd87aef08fe650c0dc6fcf..8fe10fdaac36126aa738fce9cd5e0c611cd09572 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001  Owen Taylor  <otaylor@redhat.com>
   
        * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of 
        style->font.
-  
->>>>>>> 1.2293
+
 Tue Sep 18 13:51:35 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 39686f82ee7a6f7dd1dd87aef08fe650c0dc6fcf..8fe10fdaac36126aa738fce9cd5e0c611cd09572 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001  Owen Taylor  <otaylor@redhat.com>
   
        * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of 
        style->font.
-  
->>>>>>> 1.2293
+
 Tue Sep 18 13:51:35 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 39686f82ee7a6f7dd1dd87aef08fe650c0dc6fcf..8fe10fdaac36126aa738fce9cd5e0c611cd09572 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001  Owen Taylor  <otaylor@redhat.com>
   
        * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of 
        style->font.
-  
->>>>>>> 1.2293
+
 Tue Sep 18 13:51:35 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 39686f82ee7a6f7dd1dd87aef08fe650c0dc6fcf..8fe10fdaac36126aa738fce9cd5e0c611cd09572 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001  Owen Taylor  <otaylor@redhat.com>
   
        * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of 
        style->font.
-  
->>>>>>> 1.2293
+
 Tue Sep 18 13:51:35 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 39686f82ee7a6f7dd1dd87aef08fe650c0dc6fcf..8fe10fdaac36126aa738fce9cd5e0c611cd09572 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -35,8 +35,7 @@ Wed Sep 12 11:21:14 2001  Owen Taylor  <otaylor@redhat.com>
   
        * gtk/gtktext.c gtk/gtklabel.c: Use gtk_style_get_font() instead of 
        style->font.
-  
->>>>>>> 1.2293
+
 Tue Sep 18 13:51:35 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderer.h (enum): Get rid of broken "can_edit" and